Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 00:32:35 +0000 (16:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 00:32:35 +0000 (16:32 -0800)
commit8b84b84fc0788bb4a03e417b5f709d1b5bd08c62
tree8cc887d306e184fa0571bd3021f6c431617786ee
parent5a5a49e739c179116c4d27438c0c521a58835b4f
parent2b5a03cc4cd139473ab83d1ae282957c5c8ef8c7
Merge from mainline.